Auto merge of #2257 - nrc:lib-template, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 11 Jan 2016 18:15:34 +0000 (18:15 +0000)
committerbors <bors@rust-lang.org>
Mon, 11 Jan 2016 18:15:34 +0000 (18:15 +0000)

Trivial merge